Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 4 Aug 2011 20:43:14 +0000 (13:43 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 4 Aug 2011 20:43:14 +0000 (13:43 -0700)
commitc33209e8015430d9c53b965014b395e7abf0517d
tree95689c4761e405e1716e86d75c5070f6e97cf94b
parent168faf66aeddf8c1fa69f20acee3bd02d22f775a
parent26e9eae05f594428ceaa21c11d78ee48982378f7
Merge from trunk.